From 3969d8b028e14e7a76d4f6ecf406bb9f4127a5fb Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Mon, 21 Jun 2021 09:22:29 +0300 Subject: [PATCH] gdk/wayland: Fix pointer-gestures version selection version == GDK_ZWP_POINTER_GESTURES_V1_VERSION will fail if the compositor implements version 2 of pointer-gestures-v1. --- gdk/wayland/gdkdisplay-wayland.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 0dcfb09182..4caae38066 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -432,12 +432,12 @@ gdk_registry_handle_global (void *data, display_wayland->subcompositor = wl_registry_bind (display_wayland->wl_registry, id, &wl_subcompositor_interface, 1); } - else if (strcmp (interface, "zwp_pointer_gestures_v1") == 0 && - version == GDK_ZWP_POINTER_GESTURES_V1_VERSION) + else if (strcmp (interface, "zwp_pointer_gestures_v1") == 0) { display_wayland->pointer_gestures = wl_registry_bind (display_wayland->wl_registry, - id, &zwp_pointer_gestures_v1_interface, version); + id, &zwp_pointer_gestures_v1_interface, + MIN (version, GDK_ZWP_POINTER_GESTURES_V1_VERSION)); } else if (strcmp (interface, "zwp_primary_selection_device_manager_v1") == 0) { -- 2.30.2